revert commit 9604c11a #4424
Merge pull request #4788 from openscholar/4424-hotfix2

revert commit 9604c11a #4424