Revert "Merge branch 'develop' into feature/sge_workers"

This reverts commit 65a21673a38791525931bb48748e373507aab028, reversing
changes made to ec29afce953b6e8cd8677656f8769edb964122e4.