Rift S Controller is not displayed on the Oculus Avatar

Our issue is two part. We were using Oculus Integration 1.39 for development. Avatars were working fine, but all of a sudden our Quest avatars stopped working. They appear to be only skin, as if the UV maps got messed up on the textures. To fix this issue, we upgraded to Oculus Integration 1.43 and subsequently version 12.0. On both of these versions our Avatars on Oculus Rift S display the original Oculus Rift controllers in each hand. On the other side of things, Quest avatars were fixed. Is there a way to force OVRAvatar to use the Rift S controllers on the Oculus Avatars? Any help would be greatly appreciated!