Revert "Commit them alll!!!"

This reverts commit 0c9b4ec867d5b9fa74b8ddf41c10ccb1b10b0ec4.