Revert "Actually fix the regression introduced in 7b39c38" This reverts commit 5e5c418837b569196cc17eb999b3c11a9cc0099d.