This changes public API. Perhaps create deprecated alias.