Revert "Further adjustment"

This reverts commit 01ea78bc1aa953e87ba9fb363feb72c54f72d2c1.