am 4f87c7e3: am 9b31a49c: Remove rescoping.

* commit '4f87c7e3657271f8b010832cb805ede6dc18ab45':
  Remove rescoping.