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

This reverts commit 76563196bd42a5a24fe230de5a18de3d9abf82ba (for the moment).