Revert e2f785991d0c696fbb2bc2f331f888d979b8da82 for tramp.el