Revised the regex to fix a regression in the previous commit.