am 9b31a49c: Remove rescoping.

* commit '9b31a49c3633895d9a2bf08ddb2ea73f8e8d0c64':
  Remove rescoping.