Revert "Revert "Forcing update old references""

This reverts commit c20dccbc4b115c057da72e3ec00f5099e8f3b04b.