We only have ext 3.x license so we are still using Daniil's workaround

It causes other minor issues but we live with it for now.
/Z