Revert "Remove associate records"

This reverts commit a1ed95ff6b52feea2cd70bb0638fc5fe817d93a2.