Old nacl changes never committed