Revert "partly revert"

This reverts commit b38f5f7f33c47ab06499f13eff0348876f9b9812.