
Manually revert commit [0] as it caused problems macOS (reported T96435). - Includes fixes from [1] & [2]. - T98037 TODO has been created to keep track of this feature. Thanks to @jbakker & @sergey for investigating this issue as I wasn't able to reproduce the bug. [0]:0cb5eae9d0
[1]:cb986446e2
[2]:cc8fe1a1cb