Revert "More removals"

This reverts commit a3c63bfd24c99ecbc8b3153af3e32a973b6aaa61.
shipit removal