Added some deprecations back (API not public until idea 14)