#563 has now been merged in and fixing the above in template style will trigger a Jenkins re-test,
so let's do that.