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

This reverts commit 3cc82fcb9541be738c0bb82f60149b700b24d3a1, reversing
changes made to 45ae1e58118b4198116db2b4578f0f0f505882e0.