You're right, tho I believe that was only intended as a halfway step (so even more breakage, yay!).