Oops, I just read this, so #1310 doesn't give the same behaviour anymore. I'll need to fix that.