For stable the regressions were addressed by reverting the offending commits - see previous commit. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
