@rhauser Would you have a look at c145be51 in this MR? It seems pretty harmless to me, but I may not know the consequences of this change in other applications.
I tested that it fixes the issue described in ADHI-4557.