TRUNK 4056: revert extraneous file additions and replace changes