Initial attempt at fixing bug 66622; didn't quite get it right