Revert "Merge pull request #5666 from openscholar/5326-1"

This reverts commit f351c21793dd46b60681f38ec4b698e7dfe3d8a0, reversing
changes made to 0559d7f915dc956fd5820a45358ff6bb8f4c7852.
Merge pull request #5677 from openscholar/5326-2

Use older ER-prepopulate patch as a hot fix