This reverts commit f8ae0a4c. It's too short notice for 5.21, we'll see how we can make this change more bearable for 5.22