Correctly handle obfuscation with older slaves