Revert "Revert "regular expression commit""

This reverts commit 6022b7b3a968d1d1f38e49a5870992bba5e644c5.