This reverts commit d910b4ff14 since it is causing encryption/decryption issues with RPM builds
d910b4ff14