Revert "Msd:w"

This reverts commit 9054783d94811cd0b331a4ad7465aaf72b474f62, reversing
changes made to 8aa9a626fd70b344956270c0b50a796c03736588.