Doesn't this break the API? I think you need to leave it here till you remove it for 0.7