Hoist the workaround to the base class, where it really belongs