Revert "Bye bye Braden's code"

This reverts commit 297c2263d082ed86f968c1f1ac7a70ebd32c2957.