Yes, that failure should be resolved by this change.  I'll put further investigation on the TODO list, but Jenkins should pass after this change.