This is a breaking change, we need to mark it as obsolete!