Setting this breaks some of the tests I ran. Did you run the tests after re-factoring this build?