Revert "Changes so far"

This reverts commit 4ae94669fa23c2c117fff83adde8de703a27186a.