Pull Request for Issue620

Is this commented out code going to be added back in?  If not, it should be removed to prevent confusion in the future.