Remove rescoping support.

Change-Id: Ia8e36e41e04f15befccbb7b4138f599849facd28
22 files changed