Needs proper fix later. Contributes to JB#49447
This will create a new commit in order to revert the existing changes.
