fix a [REDACTED] deprecation warning
fix a [REDACTED] deprecation warning
make this stuff work on [REDACTED]
Merge commit '6a74ed00eb220f60dd12224f7cc32e5938501cb4'