The attached patch appears to fix the issue, and doesn't break any existing
tests. I basically just undid the offending changeset, with a minor update
(set_exec no longer exists).