Reverting problems created with commit d53e1586598948344dc76293fd08a6530c960d80
Merge pull request #163 from sethmcl/issue_162

Backing out some executor changes from previous commit