This reverts commit aafa6adb. Reason for revert: <INSERT REASONING HERE> Change-Id: I8d62eb9e7f29701cbfec919a725da37021dd876c