pff, the resulting diff looks like something a couple find and replace could have handled easily