I think we should remove this change from this PR. Saw you already created #261 for this.