Switched to a callback-based approach.