Fixed part of the screw-up in 403ea6371b6d67ff3f94303303156258bed0debb