This reverts commit c5ca0373. Reason for revert: Fixing the original CL. Change-Id: Ib050c1c755fc8dcda4d297ab81605f0e40f65ea9