Revert "Final regex update"

This reverts commit 3ea741c506551e84cd4dbe7836755e76ae03ce70.