Reduce the diff between Nix and trunk

Reviewed by: Sergio Correia