Revert "More changes"

This reverts commit 0d3434d358bcd37c2975761d70803e3c5d00a36d.