Let's go ahead and remove this....

Change-Id: Ie0fc3716458efdcc389eebb18a757a6c27887d4b