Revert "Merge branch 'master'"

This reverts commit d2feca82301ae94964d0f0026734fe43e87b4eb7, reversing
changes made to bdf6dac9ef70ace917950bd7a4191b15b921c080.