I've just cherry-picked 1569af12 to stable branches, but it is obviously not enough, maybe because .yml is preferred, hm?
.yml