Partial revert of 4572e9f107d2aa98c32bbb65ab2d8891ec2a0d6d

This would break the scenario where you want 64 tasks on each node, but
only want a total of 96 tasks, since --ntasks-per-node is a maximum, this
should be allowed.