Getting #3123 working will take some more backend work...
Remove transitional code to clean up long dead bug in private

Key management, Fix #3025