Revert "Merge remote branch 'origin/dev/jpdonnelly/EUCA-3958' into maint/3.2/testing"

This reverts commit bb9304702f49d234ebfb48ca772a47ba503a93ad, reversing
changes made to 3c1af8e666c7e70f6b90160091c7a404a2cefe84.