Revert "more adjustments"

This reverts commit 4e2e6a842fb0bd79847ad714ee786129b67a38ec.