6939618: Revert 'simple' diamond implementation

Backout changeset for 6840638

Reviewed-by: jjg
22 files changed