Related to #758.
We just spotted another small bug (#775) related to the mix of legacy and new logic.
After a certain grace time, it will be very useful to drop all this transition-related customizations, especially because they cannot be tested in the CI and then they may result in other unexpected bugs.