Updated with Marcus' broader fix for rebellion CTDs.