improve instance handling V2
Revert "improve instance handling V2"

This reverts commit 88b8bf875878de8461f4077447eb1245980581a1.