Revert some files back to 5.6.0.2