Fix regression from 0d846044
(was originally fixed in 3844c412)