Revert "Merge branch 'team9dev' of https://github.com/dbeckwith/wpi-suite into team9dev"

This reverts commit ae0c1bc4787043e7d73b7c67061d96c911016127, reversing
changes made to c6d2e87acb4c22717962484a927bba2f98474ef3.

Reverting Broken Commit

Author: lhunker