Revert "Fix from closed PR #2967"

This reverts commit 903953d8da7ece2dbaf250f004df8121a4ae1065.