This change is needed following this commit in core: 661a903a0b Co-authored-by: OsamaSayegh <asooomaasoooma90@gmail.com>
661a903a0b