Revert "Merge branch 'cherry-pick-a4700095198-21.9' into '21.9'" (!37433) · Merge requests · atlas / athena · GitLab

Nicholas Styles requested to merge revert-0d63db7f into 21.9 Oct 20, 2020

This reverts merge request !36709 (merged)

Removing VMM_Shaper while excessive CPU use is resolved