Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit de9e4556f30d831c1ea65df6c079d14413287c98, reversing
changes made to 1242ccd9cea7736144671ed8dabbd0d033c3cada.