As we discussed offline (and so other people know) I'll address this hack in the velocity branch once this PR gets merged into it.