Bug 9988: Remove the Zebra code from sub merge