Revert "Revert "fix 4413""

This reverts commit 0822467a3f625d81cdc77ee95581caa26d200199.