Add a walkaround for Defect 90007
Releng build tagging for I201307022230