Revert some Optimize build options