Last fix turned out to be false, so I reverted.