Revert "Some more questionable changes"

This reverts commit 373fabf4b7fb7e7ac9799c4da3a363120cece023.