Yea, changing it at the protocol level would fix the decryption issue but it always get rejected when people bring this up We been saying that this generic decrypt is dangerous for years but no one wants to change things here