Revert "Fix compatibility break"

This reverts commit eb6e0b2bfa0166851cbc4997ec626f900268e035.
Fix compatibility break