Revert "cxx11.h: removed the 'evil workaround'"

This reverts commit 2cb9032d76e2a6751b2b2a9458c6823e23fa1e21.