Revert "Merge pull request #814 from NREL/53230709_MergeUserScriptJobs"

This reverts commit 18fcc55d4b1cd9d964d30a97154ed6ec59ea084a, reversing
changes made to 1af3192484f28c82b1fbbe0fe41f6e4a864450b2.