[BISERVER-12168] This is a partial fix.  Still getting an error further down.