This is not backwards compatible, and might be a problem. What does @stevenbird think?