Revert kdb5_util patch 83c34de8a740711961d05fde150cc8b16e68f9e1.

This reverts commit 83c34de8a740711961d05fde150cc8b16e68f9e1.