am 31298e66: Merge "Unbreak checker."

* commit '31298e66d3c9c39004bf6472dad5e768d0953360':
  Unbreak checker.