This reverts commit 6eb29f9715. Reason for revert: don't need Change-Id: If600953ae9b2de006e1ce319c68343f1c21facf9
6eb29f9715