Reinstate use cases required by gallery (removed in 555d114c)