Revert "Scroll them bad bosy"

This reverts commit d4082102c2b6a8693dce62cd4e80e61c698fe24d.
Merge branch 'refs/heads/3.0/develop' into AIWS/production