Revert "don't include the markup if there is no link"

This reverts commit dec5acf186026ce81b81c22d0e042cce4b26fd91.
redo commit without whitespace changes