This reverts commit 3c59106bac.
3c59106bac
This reverts commit c29a4dddc1. We're doing a beta bump soon so un-revert this after that is done.
c29a4dddc1