Revert "Merged in no-companies (pull request #1)"

This reverts commit 2e753b53cce9a94eb1fc2ab4ec1e0bfdd4d7cdd8, reversing
changes made to 8f3deae577c1f99a4067d7f2f10c387a713f808c.