This reverts commit 8c52989811. We now require g++ >= 4.8.1 which supports std::map::emplace(), as does clang >= 3.3.
8c52989811