This has changed enough now I think you can ditch this comment.