This reverts commit b4667bd5. Reason for revert: Incorrect reasoning for change. Change-Id: Iafbc2f3a07ca78a2f1421c6693d2c81c0085f3a8