Revert commits for EUCA-9421

This reverts two commits:
daefdaab092ab04da847df3dd599391ecf169378 "Supplemental fix for EUCA-9421"
6ac050351fd7f9f84fb44d5f891ca8ee8104b166 "Makes walrus default osg provider. Fixes EUCA-9421"