Remove accidental inclusions from commit -a

This reverts most changes from commit
d93df15cf57ffabbe8a212684c46054ae058ce9a.