Merge "Revert "Composite node <-> normalized node serializer and deserializer""