new regexp from mattw, uncomment testing now matter what version