Update to #46 - Remove option for disabling pre-dexing, to see if it builds on Travis.