Revert "back to roots for now"

This reverts commit 24ed02e3d7074b2e6683bed990665648aa79416f.