More reverts/fixes.