Revert "Merge remote-tracking branch 'origin/master' into roman"

This reverts commit 19592541bfdc10b2abcab51faea179aae97caeb6.