upstream changes
removed colord