This reverts commit faf1a40382b61d9cabab82e6e835603511046564. Bug 10932680 is back where it was. Change-Id: I5058db837941769f25f09e3fafd9c19ef370df8e
This reverts commit faf1a40382b61d9cabab82e6e835603511046564. Bug 10932680 is back where it was. Change-Id: I5058db837941769f25f09e3fafd9c19ef370df8e