Revert "Fixes #2007"

This reverts commit 472fa30b253c75533d7c7fb1196715b28a851e48.