Ah rats, sorry about that. I didn't realize the line normalization would cause the rebase to error out.