My previous comment was wrong. I can do the rebase just before we merge -- I'd like to get rid of the reverted commits too.