am d62d81d3: am 44de9bad: (-s ours) Merge "Remove rescoping."

* commit 'd62d81d32655c4ba9d912cb8ba38b250b544e25b':
  Remove rescoping.