Remove regex for now...