This reverts commit c94595f13b. This was fixed by shlevy in 1c86181857, and I didn't notice it.
c94595f13b
1c86181857