Commit non-inlineCallbacks version for comparison.