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

This reverts commit 5842ac624e02e229aae69fda734876e591834deb, reversing
changes made to 3df3fd1413827312ec4960382392ad90da2b3485.
Revert 3df3fd1..30e051e

This rolls back to commit 3df3fd1413827312ec4960382392ad90da2b3485.