Revert but forgot to cherrypick commits for updates to sidebar