Back port workaround for #1134389 from F20. It needs to be removed from rawhide once we ship F21.