Fix cf45d0cf8c3ce462c297690c6196a71cef756e82 (again)