partly revert 3df8fc