Revert "Additional fix to previous commit"

This reverts commit c9406e0ecfc717f379ea30b24d9a22247c9d296f.