Should be OK now after 88118cb59437f64a30e9f40693f0f034a6fdd6ba Perhaps the log will be nicer if we just apply the reverted commits again instead of having reverts of reverts though