Improve bug 6917 reproduction