Revert "by attheshow, kaythay, pixelwhip, tyleryoungblood: Adds Sprint 13 changes (see release notes)." This reverts commit 721722f7.
926dac27