PARTIAL REVERT: Saving of check_waiting only when the major version is 12.