Revert "Filter out keys with empty values"

This reverts commit dcef0ba59254e32bc6a9853bacb2eae9c3fdc74b.