Revert "Reduce the number of callbacks to userspace"

This reverts commit 7b6bf05d4862046c1768986e1f5ddb0a54d83011.