Revert "Merge branch 'braden' into GUI"

This reverts commit 37db2ca17c5523d29e1ba2bb6b1a2d8b61069d32, reversing
changes made to 2d3a07859724e652f8d9769ac7968cf42ad28d2a.