Revert r49653 "Make the link regex non-greedy so that it is possible to add '|' to...