Revert "Several changes"

This reverts commit 901127113822439c12963ac7e9f0159917ae4f34.