Revert "new breaking change"

This reverts commit 7d772fe06596359b451b923c916499962298607b.