Ok, with no answers provided, it seems I figured out a workaround that suits my particular case.
I hardcoded the necessary size @ line 410 and commented out the following Reshape/Squeeze block (i.e. reverting the commit 2)