Removed the "always true" check