Revert r231324 "Remove the conditional addition of the execution dependency fixing"