Revert...

Went back to the old way.  It was a poor choice.