Add nickdesaulniers's regex changes back in.