This might break backwards compatibility, see my comment in the spec below.