Recent removing of registered types from bpy.types broke this, had to
twist a bit around to get it working again...