Revert "Merge branch 'origin/master'"

This reverts commit 49ba652aba53e8831a1914f9bbc1efdb351f7dd7, reversing
changes made to e896bd6b000aaf460cbd870b4cd44398fdfd20ba.