Revert "Merge branch 'master'"

This reverts commit df639ae1230ea71bddaa52d4dc829da16173ec91, reversing
changes made to d5d9502531e1623c677734faea47ed0efbc2bca0.