Revert "Patch: Remove old"

This reverts commit a79ae90931746af992a19ba2d3910038764955e0.