Use a new implementation that does not require core API changes.