This reverts commit 4433c435. Reason for revert: May be breaking tests. Change-Id: I3b690dbb06278dc1adce5a389fff938a692bdebd