Revert "RM" EM - reverted last checkin

This reverts commit 01e7da0e8e968c95cb7fd6a870fd72616cc3a28f.