Trivial import ordering fix to make go fmt happy