Revert changes to fix round-tripping of empty String Component in Composite
Original commit 98435e5a3bf85f73d849b1d8074bdeab10128319