Attempt to keep callback #2
Revert minor change