Oh, we should really update our base template then (which uses the same pattern). But let's save that for another bug!