Revert "More changes"

This reverts commit 8ca408f4d6ba7a2bdae606c8910f0aa8bd0954a2.