[DO NOT MERGE] Remove code pulled in by accident.

Remove code pulled in by accident in cherry-pick commit fbc5b9f56.

Change-Id: I4e4a336faf71782c208631c581b2587a5364212f
1 file changed