This reverts commit 5f7cc7d2e1. Reason for revert: Issue 9283 Change-Id: I3a53da69d4a774643a3b1a6924bc842a1e681cb2
5f7cc7d2e1