Test and fix for SI-5130.

Just removed the guilty branch.
Test created.
Partest passed.