Reverting class regexp as recommended.