Revert "attempt to fix #3838" to fix #3863

This reverts commit 4095e682ac14ca72d1db2febc9b4cbb19ffb1589.