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

* commit '44de9badfa4a39d3de1ff17ddcac7ce401635e39':
  Remove rescoping.