Yeah, but I think we could remove the deprecated code though.

/cc @jonleighton