Bug 18589: (follow-up) Fix merge problem