Reverting remappings because it led to conflicts