Revert "Some previous changes"

This reverts commit d8ba682442494d0b9d057ec632794b9d878da8ff.