[IOT-3219][IOT-3220] Restore default handlers