issue #3956:Remove some unrelated modification