Fixup commit 3791244710