Reverse commit 6ec51b3
Fix deprecation warning