0e9fce7046
This reverts commit 8248279894.
Reason for revert: test stopped failing
Change-Id: I7993e38124530bdb0bdbb3447a449bd727b56d0a