This patch should help to better scale software on the cluster, CPU
limits are not that big of a problem.