Fix failing exec tests introduced by previous commit.
Revert "Fix failing exec tests introduced by previous commit."

This reverts commit 130db892e069d2430647ff111140a9398c416735.

Accidentally included other changes.
Fix broken tests take 2