Revert "I has company"

This reverts commit accc17e675e1d9073669ab7a7f1acdc61e08ccc4.