Revert "Merge remote-tracking branch 'upstream/jellybean' into HEAD"

This reverts commit 0e6a2e69e4c85936e7add279ea373818e24e0665, reversing
changes made to bf8f4829552a65af099e6d811ed7046cf3ea36ce.