Disabling the Match-on-Type Feature