Disabling extra logic for testing