Yet another merge-bug removed.