Back to original functionality

Previous release had to be done to test, but it didn't accomplish its goals, so back to the way things were originally -- when they worked. :)