revert 9ee2fbeb, merge conflicts #5245
revert 10955d4, merge conflicts #5245
Merge pull request #5249 from openscholar/5245-menu_links

Revert menu_links components commits