Undo revert of 38357870
The changes in 38357870 could not be merged automatically into EE master and have been reverted from CE master in commit 5aa0120d.
@yorickpeterse: please create a merge request for EE that contains these changes and resolves all conflicts. The changes in the EE merge request must be merged before this MR, otherwise the changes may be reverted again.
Original MR: !19384093