Revert "Revert "Use local mps list""

This reverts commit 0608884047978d552aa34d5482146832454082f1.