Fixing an issue introduced with Review Request 22717