Attempted fix for #1868, which didn't work, but it seems likely we'll need this for other reasons...