Revert "A few changes"

This reverts commit 8664e68447f85e594291db047a29b9d8bd01270b.