This reverts commit 5da49ff2. Bug 4964762 Couldn't get this fixed in time without causing other problems. Change-Id: I3d62787fb34014ab37b4aa4c1dd7c5ea5ca3777e