BUG: Change back from the decorators to register virtual subclasses for py2 support. >_>