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

This reverts commit e294b1361e95d87b0e6993ee9e999b6cd6d92213.