Revert "Adjust for multidir pip"

This reverts commit 2e4110f090f4d956ea1df389f5a702c7712ba344.