Reverted in-progress changes to breadcrumbs

Will finish and update breadcrumbs in a separate future pull request