This reverts commit 38d5a278. It breaks things. We must do that part by part and check for regressions.