Revert "Attempt simplification. [skip appveyor]"
Revert "Attempt simplification. [skip appveyor]"

This reverts commit 246cb774b735db77b2e31d33eda7f3a7aa059539.

bluescarni/mppp,bluescarni/mppp,bluescarni/mppp