Revert "4.4.24 main files"

This reverts commit c8f6f561441a9872538be37fa89bcda3570d6068.