This reverts commit 2c37a4f3. Reason for revert: Reverting for this release. Change-Id: I10e1e271de7c7e715d6173ad83c7bb87e6473c82