Revert "DP works, EOM not so much."

This reverts commit edebc5a3278b8dac7fd533b4226c1a65bff77567.