Pick up a PR we forgot to backport
@@ -1 +1 @@
-Subproject commit dfd960b5f1a1751b22738fa34fd27b583f4618db
+Subproject commit 54d95ca0bd603c322601a61255898e2b8d2a3cae