MANATEE-188: Rearrange deposed check and set when rebuilding.