Feature no longer needed. bug:18448377 This reverts commit 4678dcc5. Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea