am 23d5cffc: (-s ours) Revert "Always enable lock level checks." DO NOT MERGE

* commit '23d5cffcb8e32aaa6ce0895ade28849f72d90463':
  Revert "Always enable lock level checks." DO NOT MERGE