This reverts commit a5c7955670. We need to push out a release to fix some bugs, so let's leave this out for now.
a5c7955670