Reverting API and simply "doing it right"

Reverting change to `regex`