Also put back another change I lost along the way.
(#350)