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

This reverts commit 471b4c06df3481d4e25f13feb18766a9de607320, reversing
changes made to 6447220de916aae0315fb3a94a085a9bb8b84906.