Revert "Force instantiation to fix link errors in last commit #3496"

This reverts commit 1dc42b7192f94ba6e02ef5283ef185c74776795a.