Revert "breaking change"

This reverts commit 6cdffcc94f74182ccccc0ee12de15217c39c27ef.