Revert "Revert "Try to use generated PStates...""

This reverts commit ac172e1e0fe2add503c134fd217b6724c7133706.