b40fbc5
Resolves: #1145235, #1173488, #1176318 – revert a couple of recent changes Let's revert a couple of offending changes like we did in F21/F22 branches. We can revisit them later and do them properly. See individual bug reports.