Revert "Merge pull request #1367 from openscholar/1357"

This reverts commit a22ef02d38ced5793ac6236d874186a7bdedaa0f, reversing
changes made to f1b44fe27d62319667fc1863e5ce9c10ba85bd3d.