If this isn't backwards compatible, maybe we should update the requirements?