Back to using the deprecation library