This reverts commit 8e089728. Reason for revert: It turns out we don't need this feature Change-Id: Ibc042e451d66a1b87ed416bed41461df52f70a66