Revert "wip 60001"

This reverts commit 7756a012b502c6cbcdcee6a76ee3bab389d45dd6.
Revert "bugfixes 60000"

This reverts commit e5ff671352ac999f8baf83c4ae3e77b5dc78daba.