Revert "Regex Improvements"

This reverts commit 60eb9d5de9cf59e6215ffa3c47187bf221aa9ab8.
Regex Improvements