Remove unused calculation from bad merge.
Merge pull request #4361 from brendandahl/remove-unused-code

Remove unused calculation from bad merge.