What do we want to do about this deprecation issue...