This reverts commit 3e8abc77. Reason for revert: Fix is correctly done in ag/21027240 Change-Id: I97beb71d27aa4499db0ead3ca2ae1b1ebd67e9f1