tbranyen: can't cherry pick their commits, their modules are wayyyy different