This reverts commit 5f8162b086. Reason for revert: Turns out they're being used. Merged-In: Iad9010190c7a4140b69dc553df5debdd88dcf81a Change-Id: Iad9010190c7a4140b69dc553df5debdd88dcf81a
5f8162b086