Of course, after merging some problems come up. Let's fix those first. This reverts commit f2f01595a5.
f2f01595a5