[INTERNAL] nearly cxx11-free again