Revert: diamonds: wrong constructor selected (IDEA-123518)

(cherry picked from commit 6e4249e5e119b30cfd1ae1c6e9ff47c02c36d7a2) (a236092ae29505636272c6e354cf1e5ab916ab97)
Merge remote-tracking branch 'origin/135' into 135