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

This reverts commit bee1703ac758af1f67833ad3f405285e1ec923bc, reversing
changes made to f1ad841e74636e2d7d9237fed908a123f0565312.