Remove extra parentheses and swapped regex back