Revert "First batch."

This reverts commit c2b8e561d94c993e7d5d177e2901d72d6be98176.