Revert accidental premature merge from nkadel-libserf.