I think this addresses Bug 1070.