This reverts commit 93f630e1c3. Change has already been reverted in master, hence DO NOT MERGE. Bug: 34348911
93f630e1c3