Revert "Disable some optimizations to make this build with GCC 4.9 cleanly."

This reverts commit c63d3f16729668a55fa4e0eec48ebee691797cb6 (for the moment).