Muddying upgrade state transitions...