Reset everyting back to revision 56032.
My partial reverts of things appear to be creating bigger mess.