Issue #1760026 by Jorrit, burningdog, adamwhite | mikran: Fixed compatibility to next Core, work-around that was added for core issue #1859084 is now removed.