Suggested fix against master attached, please review.

This patch needs backporting to 9.11.  9.10 is not affected, 9.9 does
not support --with-tuning at all.