I’d like to bring GEODE-8068 to support/1.13. This commit reverts two prior commits (GEODE-8033 and GEODE-8044). GEODE-8033 and GEODE-8044 introduced an experimental feature that is useless in its current state and has already been redesigned, so there is no reason for it to go out with 1.13.
Regards, Patrick
