Revert "diamond"

This reverts commit 826c9bdc14b01433fe3da377148c860a913f2763.