This reverts commit 1ee6dd71. Has unintended consequences that need to be discussed. Bug: 31684920 Change-Id: If0ff1b5d7473f98cb3a0efc3b4bb2c0f96ad684d