Revert "Several changes"

This reverts commit b9b026966c9caa9c81fa5afe1444f924a250768c.