Actually remove the bad toggle mapping this time...