This reverts commit 4bf22ae076. Reason for revert: land the change again Change-Id: I334860af201ce0faa09f1dbb8935bc9fddd66c50
4bf22ae076