Revert "breaking change"

This reverts commit 632fa822348bb19672f22345f393edc7d0a82db6.