@xi and I have decided #2842 is producing more problems (addressed in #2860, #2862, #2863) than benefits (#2850), so this PR redoes all the changes that were done since #2842 except #2842, #2850, #2860, #2862 and #2863. So, effectively, it reverts #2842 and its follow-ups.
@xi and I have decided #2842 is producing more problems (addressed in #2860, #2862, #2863) than benefits (#2850), so this PR redoes all the changes that were done since #2842 except #2842, #2850, #2860, #2862 and #2863. So, effectively, it reverts #2842 and its follow-ups.