Revert "I aparently broke this back in 2012. How has anyone been using this software?"

This reverts commit a034262e034f463105ca43c90efe07b9d69e1f41.