Revert "Fix callback is called with window, should be grid"

This reverts commit 337ab8efd7b1542f4ef532624a7a0e3586801b6c.