This reverts commit 1d5063ea3e611480745a2f7ba69ce83b16cb742e, since the mechanism is not working as expected.