Revert "Merge branch 'github/master'"

This reverts commit 3a59350eb049d6d66c5111ee7bca634eb84a51ae, reversing
changes made to 187828a581daad029c489f2edcd14ff16d4ec0b4.