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

This reverts commit a0ed39393dce60cc49662aa292590fe6cf58f3e1, reversing
changes made to 2d7ae0331cf3ff0441056c413f2572a8d4b52d9f.