Yep I remember.
I think this swap would have allowed you to keep the efi.

But I am also at the point that drivablilty is more important then speed.