Adding protions of code that were removed during a previous merge.