Revert "Merge branch into jb-mr1"

This reverts commit 1f2b2d02cf00f7c647bdb4c5306ba2cd781aa604.