Taking back 574d3cb, we need the 
self-links