Revert "trying to merge a bunch of commits into one"

This reverts commit e0a7301c01e792510e0123c07f0e56f89dbce345.