503ce966ef
This reverts commit b80c6c347a.
Reason for revert: The original change was not the cause for the test failures
Change-Id: Icfe0da43a96f5471076554c4dd25eae649bee81e