This reverts commit 65dc78d6. This caused a major code-size regression on tramp3d-v4, revert until I can investigate.