1ecd40d002
This reverts commit ea3b4a73155203dd484b62872814a91df39dbf9f. b4099e568a9aacec53eac2dbf63905fdf5658a41 handles this more cleanly.