This reverts commit 558034ab as it appears to break the auto builds. More thought is required for this!