Revert "fix #12531"

This reverts commit d99d79d2e8a0d6c1605f6948adab9b7826a5da42.

Fix #12569.