This reverts commit 8ae96de9. d584b233a571fcc is not a follow up fix. It is an incomplete version of 02d03b462412295.