This reverts commit 214a199f. Reason for revert: This fix is not enough, reverting both CLs. Change-Id: I3fcd2a556fd98321ebf7fca444ae6c790b87c9f2