Revert merging #10431 into develop

It does not agree with the build at the moment.