Fix breakage from #467 / #475