Revert "Merge ShapeArgument and ShapeArgument2 to ensure that Particle's cannot have handles named consume or provide (#1919)" (#1923)
Revert "Merge ShapeArgument and ShapeArgument2 to ensure that Particle's cannot have handles named consume or provide (#1919)" (#1923)

This reverts commit 462cbd210cdab6eb1cdb395ba7043cff3a4b0f4b.
PolymerLabs/arcs,PolymerLabs/arcs,PolymerLabs/arcs,PolymerLabs/arcs,PolymerLabs/arcs,PolymerLabs/arcs,PolymerLabs/arcs,PolymerLabs/arcs