Remove incomplete abort stuff that I accidentally left in last commit.