The flag is on by default, but allows us to revert back to the old behaviour if we encounter any problems.