Spencer Walden
Revert some code changes #checklist