3.3.2
* Revert "Cherry pick pull request #2444 to 3.x.x (#2506)" This reverts commit ace926905a5921fc57df1178a38e4f39f5eb9a55. * Fix build because an update to an unmanaged dependency broke the build
* Revert "Cherry pick pull request #2444 to 3.x.x (#2506)" This reverts commit ace926905a5921fc57df1178a38e4f39f5eb9a55. * Fix build because an update to an unmanaged dependency broke the build