Hotfix oldstyle classes

This patch has priority going into the next release.
git blame = thomas
I BROKE THIS!