Revert "goimports"

This reverts commit f26d41791c5512c124cb74be56e7c11ec83af289.