Hopefully they make it a breaking change in a new edition. A little pain when updating will be much better than carrying two slightly different implementations in the long run