Revert "finish work on changes (+2 squashed commits)"

This reverts commit 231b6b51a7b27dc09b9d95e04c57ead7138f3026.