Merge pull request #1102 from bradking/remove-unnecessary-StatIfNecessary