This helps, apparently

(cherry picked from commit 347c67bd60b15da583b70f32123598e70245158c)