BAD Upgrade
Revert "BAD Upgrade"

This reverts commit 1e890a3ddf3b4ec1e4eafa2f416b6aae365a9239.
FINAL Finished