switch back to upstream module.. PR merged