02458386cf
This reverts commit 5a9dce518e.
Reason for revert: The solution is inefficient. There is already a solution in ag/17060224
Change-Id: I5b5862f1ae426c78062c5a0f481abfb13b3060cc