Revert "Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1"

This reverts commit 52cea28e15f772027c620dc701e632626d37ed58, reversing
changes made to f63b6e882220c9b3adfb51f29f510e801d527d73.