Revert "Sneaking in a fix for #1437"

This reverts commit 740c90ad8318f6735b06bf69f641f77dec2f3bcf.