This change fixes bug 7820. Way back in April this bug was reintroduced, it appears...