Reverting some unintended changes.

Had a problem, thought I would use regex, then I had two of them.