Restored changes clobbered by previous commit
Restored changes clobbered by previous commit

UMD-SEAM/bugbox,UMD-SEAM/bugbox,UMD-SEAM/bugbox,UMD-SEAM/bugbox,UMD-SEAM/bugbox,UMD-SEAM/bugbox,UMD-SEAM/bugbox