This reverts commit bacf34d9. Reason for revert: reland with fix Change-Id: Ia03f2808353f5640597ae7ecbf2e06fc903c6977