Revert "Disable the option of choosing p2019-pq surface type (it doesn't work correctly at)"
This reverts commit f6fdc1317e2447ccee625cba9b786649f17181a4.