Bullshit checkin to add the fact that the previous changes also include the final fix for bug 72721.  I am a buckethead