partly revert 1d5712c4