Tentative fix for bug STS-3468