Revert "added some breaking change"

This reverts commit 8594e427cdbccb460e045a7f0ac135998edb3583.