Revert "Tweak to fix #1110"

This reverts commit ac3acefa9e1cd0a6e58a12a144d0e081cb81240d.