Bug 10933: (follow-up) fix the previous patch to work with master