This reverts commit bf2c7831c8. This was a bad idea as we need to access some of the main attributes from commands via instance=...
bf2c7831c8