Revert code unintentionally checked in; remove unused code

Change-Id: I18160855280173a7599ee7e9252f4dcb2daf7143
1 file changed