As demonstrated by the tests that do not pass anymore, that basically reverts #8879 which is not possible.