Revert "joe trolling from brandon"

This reverts commit dbf9689d36bfc3d6ea6d8586380e7d662a32c369.