Revert "First round of changes"

This reverts commit 6c11faa4ba0060102ede530b8cd13b120f996061.