Revert "problem 10642"

This reverts commit b3e9ec2b45f72fa38e39f315b77bccce0cbf5d95.
problem 10620