Rework recovery of common so it works in both production and testing