Review this fixup of ab1ae3c