This reverts commit 8ad96a35. Whenever we go back to that experiment (#6729), we should do it in another branch.