Reverting map changes part 2...