Revert "Revert "Revert "Forcing update old references"""

This reverts commit 52f90b019cb44ee6a38cf7a6b136b6bdd60a7a55.