Should probably add a comment about why we're trying one then the other so that we know when we can undo this.