This implements the suggestions here.

Fixes gh-12090

Comment From: onobc

Concourse CI had a hiccup when running the 2nd commit and I don't seem to have the creds to restart it.

Comment From: wilkinsona

Thanks very much, @bono007.