d6519668bf
This reverts commit 73aa3025c0.
Reason for revert: Post-drop revert
Change-Id: Ife752d26e07d9c064c938ff8d33d40457b54217a