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

This reverts commit bbcddf29c022dcc5e49e1f2a89d618472e149d39, reversing
changes made to 1495b51c17e63aa94e837cab14da1a9004bbf89d.