bug 905287 was caused by this commit.  Reverting "Merge pull request #11351 from jmcanterafonseca/fix_link_img"

This reverts commit dce27932836dfdf9645eae565bda084692ed1a1d.