Revert "Fixed a bug as reported by Fraser"

This reverts commit 858874945589648cede51def24740e9ea1acc5fc.