Fails to apply. Revert "Update mps(4) via 8-STABLE"

This reverts commit 94c2fd4c634fa6fb88d4ffe0237a759d1768b3b9.