Revert "slight change of class/instance types"

This reverts commit 0f09c12514842d9f4aca61ead52270a334c3c873.