[IM] Well on the way to a more generic Action/Mapping architecture which is going to make things a lot clearer.
Revert "[IM] Well on the way to a more generic Action/Mapping architecture which is going to make things a lot clearer."

This reverts commit 2c4fd07bb2700cedea25734b28e8e637067372f1.