Same as e0df56f25d. This was accidentally reintroduced while merging c8241e730f.
e0df56f25d
c8241e730f