Add a bug-compatibility flag to disable the