This reverts commit a5ae5afa. FIx the test that didn't consider the test was running in pre-C++11 mode.