Undo special handling of NO_BOOST