Fix for Bug 6259 (didn't bother with test since this involves rollback)