Revert "Address DeprecationWarning"

This reverts commit 4c6e8d610b36953408f85dffa9cd67a4fc4c7e38.