Handle disabling of addresses with extensions correctly