Committing again because I screwed up the last commit

The last commit did not contain the old code commented out, so this is fixing that.

Author: nfbrown