This reverts commit48abc7aabc&62599317dd. Revert !126755 as it was only meant to impact document generation but it infact made functional changes, see: !135352.
This reverts commit48abc7aabc&62599317dd. Revert !126755 as it was only meant to impact document generation but it infact made functional changes, see: !135352.