partly revert 7be996c