ece659d11a
This reverts commit 377eb40985.
Reason for revert: failing tests
Fixes: 266606727
Fixes: 266621449
Change-Id: I61094be02fb73c5ad65ee65be5ed93a3364f37ef