Revert "Merge branch 'master' into products"

This reverts commit a727a956490a68419133b58043a28e17f66842cd, reversing
changes made to a3d600c31e23f1027de12b6bb43196deda0aa04a.