Bug 23433: (RM follow-up) One last consistency improvement