Revert "No need for C++11 here"

This reverts commit 8bbd1be6d0fd8094aa11ad71709c94aa76076838.