Clone of upstream to workaround docker wedging