keeping the old one until after 1.1 for BC - though @lsmith77 is proposing we don't even try as in the end we can't provide real BC anyways.