Continuing a8ad3abc15a2 which actually forgot to ensure freshness in current env.