Revert "Merge pull request #306 from xylar/update-pm"

[xylar]

This reverts commit 592aaa9, reversing changes made to 9357439.

This is undoing #306 because it included much of #303 and we aren't ready for that yet.

Checklist

• User's Guide has been updated if needed
• Developer's Guide has been updated if needed
• API documentation lists any new or modified class, method, or function
• Documentation builds cleanly and changes look as expected
• Tests pass and new features are covered by tests
• PR description includes a summary and any relevant issue references
• Testing comment, if appropriate, in the PR documents testing used to verify the changes