Ex-Canadian-resident resuming residence - deemed disposition of property?

If I have owned an investment property in Toronto as a non-resident of Canada for at least four years, and am resuming residence in Canada for job reasons, is there going to be a deemed capital gains tax on this in the first year even though I have not sold it? Is there a way to get this tax deferred to the time I actually sell it - what's involved?