Partial revert of r35794. Additional file added to commit that shouldn't have gone.