Yes, now with class decorators, this should no longer be needed anywhere.