Undone previous change: leads to key not found errors.

I have undone the above change since I did not spot all placed where the
moduleLoc is and inserted in various maps.