C++11 solution for previous commit

Let's see which gods (new term we use to refer to build bots) we anger.
Will revert after.