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

This reverts commit d60518764ffc6e225335ed6c86beea9fca624ff0, reversing
changes made to 849733b2208a8b871c1c72b63047a1e5665c5d75.