Revert endpoints import

The latest changes are not yet on staging, and this version breaks the
integration tests. @cjohansen