Revert "Merge commit '694e7680203098c32faa33546e48094bb14376bf'"

This reverts commit f47f5727775702a42abf0a292849f0efefb96ff9, reversing
changes made to 6b8e78a28b56db3b2a14de19424d96400d7325e0.
Revert "p1_m_mod1"

This reverts commit 6b8e78a28b56db3b2a14de19424d96400d7325e0.