Done, regex is not used anymore, see 198210a749965115cd51a579dca5a50cc8f63a92