Correct pre-10.6 image rebasing