d782394132
This reverts commit dd176e65e3.
Reason for revert: Post-drop revert
Change-Id: If93eb4bca636bfba2471c8992621a59895bfcbe2