Revert "Merge pull request #5157 from openscholar/install-speed"

This reverts commit a69a2b6c9b65a00880df4df3dcea2fdd2d6940e1, reversing
changes made to 800519761b95fcf3d512e21251d1bb687e5dd4aa.