[CLEANUP] Remove old hack, CTFE is better these days
Merge pull request #2175 from DmitryOlshansky/cleanup-regex-1

[CLEANUP] Remove old hack, CTFE is better these days