This reverts commit 6981c29394. Also updated the deps to get the latest, which has some fixes we need to start using this.
6981c29394