Revert to original kind declarations, as there is a defaultKind defined, otherwise the DOM will be messier