565e6afc48
This reverts commit 6999ed124d.
Reason for revert: Bug doesn't repro
Change-Id: I3a9c3e68c140b7f25a7f7a13a453b9441706ade0