Revert "Revert "Revert "Revert "Skelettupdate...""""

This reverts commit a826cc151fda9d36014235f3c3bafa42671cbda3.