1387 introduced a rather serious breaking change that's causing pain
throughout the community. Even though it fixed a buggy behavior
the previous one was still useful to a lot of people.
This change introduces a way to revert back to that old behavior.
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>