Nit: Might be nice to say "Deprecated, remove in 1.whatever" in the comment, just to make it easy to find when we release 1.whatever.