This reverts commit d3c4ff8b. Reason for revert: workaround is present Change-Id: I40f794ce5f401a7357099dff10f7f8e05e1c4826