Bug 16111: (QA follow-up) Changes related to partial revert