Revert the r30852 from r30863: the wrong patch was applied on the
trunk and then pulled over here to v1.7 as part of CMR #4253.

RM has given verbal approval to manually fix this.
This is what r30852 should have been (that came in via CMR #4253 in
r30863): Consolidate into a single, outter loop of ibv_create_ah()
calls

RM has given verbal approval to manually fix this.