am 7f124b4d: (-s ours) am 4a9fd609: Revert "Update all mapoff checks to check against 0."

* commit '7f124b4d89f0e8669ffbffc0dbc0a028120326e6':