Go back to the ticketed version we had several revs ago.  It passes tests now just fine.