Revert e8ff823..243e19a

This rolls back to commit e8ff823f01cb8c7ac376a77c541e2f47db344415.
MAXJOBS 1