Revert "A few changes"

This reverts commit 892104d9bade02b82c050fec353f70bb6b34db0e.