Bug 28847: Remove dead code and make regex consistent