this change has been removed, but yes, eventually there will be cleanup and api breakage.