This reverts commit 689caf04. Reason for revert: Did not fix regression caused by prior CL. Change-Id: I8a01bacfa98539d2980095c445cd580d73e39975