Yet another implementation, relying on a backwards-compatible core API change.