Same as http://paste.factorcode.org/paste?id=24 but this time the patch actually works, tested with a full compile and latest git sources.