Sauce and fixes

I've reverted that chunk of my patch.