Revert "merge devel mrd"

This reverts commit 3f625a9347fde47625f14898c0a3a6ed4f49b55a, reversing
changes made to dc6faeb30355bf9c6f0f3694e8546bcdf26372a8.
psi stat tests done and failing gracefully