Removed build optimizations (that weren't worthwhile due to the current
setup)