undid changes to rmap.c