Revert "add "nextExecutionContext" handling"

This reverts commit 88e4f5b508e383e7120dad925cd0b27c81208744.