Overall, the state transitions are a bit broken here - let's do a targetted fix for 3.5 whilst avoiding a re-write.
Overall, the state transitions are a bit broken here - let's do a targetted fix for 3.5 whilst avoiding a re-write.