Revert "Another attempt at fixing the strange URLs in annotations."

This reverts commit b52e24b8ea81aee5eb81589de21c3359479f0a13.
Revert "A hack to cope with example URLs in annotations that containe spaces."

This reverts commit 44e8a7bf6a10c9f74425a38d5f7bbca6b9a1deaa.