Revert "marcy"

This reverts commit ccd9597d5aa46bd8dce456f9197cdcdcc7977ed0.