A patch to fix this problem as described in issue 2805981