Revert "Remove some missed stuff"

This reverts commit cea1ceac21a0f0beba56ce203eb6b60bdbb718be.
Revert "Remove some stuff 4.4 style"

This reverts commit ca82ea46aa8b3d96819273943f49cf695d61ab90.