Revert "Some adjustments."

This reverts commit 2cc89cabea121bbad617c3117db4fff9a99fb845.
I don’t think this is gonna work…