This reverts commit d910b4ff14 since it is causing encryption/decryption issues with RPM builds (cherry picked from commit fbcab01ff0)
d910b4ff14
fbcab01ff0