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

This reverts commit bfc120e4fe30d3950ff70a2cb5bf5eedf1b3ab06, reversing
changes made to 76dd99ce78b02ff66f420e726b40f23b2d1f8d02.