I don't want to make breaking API changes as part of this PR, but I agree that it's confusing.