 The Ancient Olympic pentathlon ( comprising long jump , javelin , discus , the stadion race and wrestling ) was a precursor to the track and field combined events and this ancient event was restored at the 1906 Summer Olympics ( <unk> Games ) . A men 's all @-@ around was held at the 1904 Summer Olympics , contested between five American and two British athletes . 
