Fix mistake in 38c494dd and remove faulty previous 'fix' attempt