NFC: Submit the missing pieces of previous commit to fix build.

(remove stale code)

Change-Id: I0d08650b6d694ac4493cf0074696d4e1be7d9f87
3 files changed