Revisit bucket stripping

[AlexGustafsson]

From the code:

// TODO: This is not really a great idea.
// First, it scales badly - three rows per entry
// Second, it forces default values for ports etc.
// Third, it does not provide secure defaults - every time a new field
// is added, if it is not added here, it will leak information