This reverts commit 1906fc5bd10a7bbab35136325fa3251a043361b2. After 18a6a778 it isn't needed anymore.