These changes should be part of a separate patch I think, they have nothing to do with the tx redesign.