Restore gcc 4.6 compatibility