Revert "EUCA-7281" Per Jenny and Alice on IRC. Kicking the can down the road to 3.4

This reverts commit 05933db2c1923dd529639a58a62d81dc6379eecf.