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

This reverts commit 4eb4940ccd5194b4e5271056f0963dd968c43180, reversing
changes made to 088eab5ce2a8f532c0b335e015c7c48cdcfa4e1a.