Revert "core: Patches for 4.4.4"

This reverts commit d6b1ce6be82f2811b815c4eddb84ce0bd4909527.
Fix 4.4.4 patch