Revert one of the changes introduced in commit d6a780ab5d4addacfb5c71b83798163b25d5b0c7

I did not understand the power I was holding with the array-approach to
matching units.

-> Added a more 'powerful'(?) regexp to catch URLs which replaces the
primitive one. I suspect this one might cause some problems in the
future which I'm not yet aware of, although the suspicion might prove
invalid.
-> Cheese.