This reverts commit 220ce8f269.
Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week.
Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55