Revert "copy from skeleton"

This reverts commit 2d62e7e2bc6c93c0776a42fce681905f38f10690.