Yea, I think this could use another iteration.  But wanted to get a reliable hotfix in: 
See: https://github.com/openscholar/openscholar/pull/5302#issuecomment-35200955