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

This reverts commit b77c556fe0197cd9b2b675a01926c50294a99804, reversing
changes made to ca216f628b64155456064b136badc98d2643d95e.