Remove deprecation by commit 3951b51