Migration change, no longer compatible with 1.x branches