Yes, that's the simplest API fix.