Revert "Various changes"

This reverts commit ae51ab78d6f89097cdd8abc4f74492185ec9ecab.