r274275 fixes a problem I noticed while doing more work on this, although I wouldn't expect it to change much