60e4fba3 did not completely fix 2cc8fa41, now it's hopefully fully fixed.