The diet seems to be too strict, jobs failing with "out of sort memory". Needs more investigation before resubmitting. This reverts commit 1e66388c5f. Change-Id: Ic10effaaf047eb3527082baab889772c5e57fa90
1e66388c5f