Upload remapping is a bit too enthousiastic

Is this still an issue @sam?