Revert "Fix what appears to be a git-merge smashed file (static function duplicated,"

This reverts commit 048c3ac81829e7c7395a6244020256812f352711.

I now see that we have local changes to this file (but it's still not clear
what it needs to actually look like - I'll wait for Xin to look at it).