This reverts commit d7302549. Reason for revert: Adding separate workaround for this change Bug: 156669445 Change-Id: I3ccc857bf6ecf5509e5594ff913d3c575fcb5ad7