This reverts commit a42f4e68. Reason for revert: fails on target. Change-Id: Ib5119b5aecabe1105d4aab2f127138de3d19c8fc