fixup prepare for tier change as well (bug 865657-fixup)