Revert "Merge remote-tracking branch 'origin/master' into QA-170a"

This reverts commit 18091e612f152c3402a15f1e1638fc02f6931e50, reversing
changes made to 4970a444795cce68f24938643941fdc5784b95c4.