This PR shouldn't really make API changes like this.