This reverts commit 8ae1be12. Fixes bug 23187090 Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2