[TASK] Simplify implementation of 4.x compatibility