Revert "Fixes #3542"

This reverts commit 7d23ab4a24808cab973ab8db76fc1b6bdb60dcbd.