reverting the reorganization done in 3455-3456 in order to make merging my experimental branch to trunk easier.