Sorry, this has been reverted later in 267fb61277ac960ad443d239febcb3136a007d24 because it caused too many inconsistencies in the test suite, making tests fail.