Revert "Various changes"

This reverts commit 5a3897a014e5f42be2f2aa6e21190ec7aab1b8b5.