Removed debug code committed while fixing #460