Exec stub, Partially revert commit cd39544f02fb5cd96ae9ecedab22beef976d4e0d