Revert "3,2,d"

This reverts commit fed17ee7fa55fd8596ef0bcaa64cdc197d474e98.