Revert "Fix NRE on sending multipart texts."

This reverts commit c9affbdb3eaf640b4516d0269b4f8b31888f83b9.

Change-Id: I90c21ae37d1673e4b93038b0735315a147d7d3ed