Disable is_controller / is_storage logic