Reverting 17479/17480, breaks subclassing of Linker methods by skins. See my comment...