Revert "Merge branch 'master' into slack"

This reverts commit 9965d5101fd8977a45e8c5a02cc9288acb060cff, reversing
changes made to e584bb297b1c2ca0c2f5ae19954f92a675b1167b.