Revert "try to fix #3816"

This reverts commit f150e9439c012e1b564af70af132bf32e5c116b1.