2.8.3.5-RR-YOGS XML update

The layout has been reverted to the one easier for us to update quickly, so this looks worse than it is.