Undo mapper injection for training ... need to think this through more.