Revert "Merge branch 'master' into QAART-381"

This reverts commit 6bc56bc2f8a78292087d795ac9c56a2c15e21ad6, reversing
changes made to fa7fd1380e2ea621e9655e20f538c53a22c8e513.