Yes, your fix was the base of this. We thought we had avoided it previously, but as the bug reports came in that theory was shot down. If we find another way to avoid rebellion CTDs, we'd love to scrap this fix.