The 2.6.0 patch needs to be cleaned up A LOT before it's useful.  

I did too much fiddling and now it's larger that it needs to be.