Restoring upstream deletions

Change-Id: Icd72e3c1c9e4f45b6de6f5892f284e4898ca854e