This reverts commit 88352408958d905c77ad0461036196282c39cf69. 4.6.0 is quite broken. Let's wait for the next release.