Revert "qMerge branch 'master' into pieces"

This reverts commit edc87741ed73975e612931960afa8debe746bbd5, reversing
changes made to df9ad3a8db30f4e050fe5ad8b80483ba62867d1e.