3980 primary address demotion

Hope this can go in as a hot-fix, it should address some rather bad ODE bugs in 1.6.x