This reverts commit 741bf840da. This reverts the fallout from reverting the major changes.
741bf840da