This reverts commit 973fa6b334, reversing changes made to 41b5fe86b6.
973fa6b334
41b5fe86b6
Signed-off-by: Vishnu Kannan <vishnuk@google.com>