Revert "WIP: xlink:href needs xlink:type"

This reverts commit b7492725471aafe780ace25c67208dbbb08db4ff.

Change-Id: Ice3ba98e495d5c66afc9897c45f5a469693e6c43