Thanks for the write up!

So the cheapest way to do this would be to remove the original assembly and disable the locking pin (which is causing all this trouble). Correct?