Revert "Merge branch 'master' into tommy-dudebreaux"

This reverts commit 2cabd0579d903aee96921985aea9293e4dafb8f4, reversing
changes made to db975b42a0ae295b6716700900a4724d97f1d9c6.