This reverts merge request !28548 (merged)
This is pretty embarrassing by now. 😦 This MR should be reverted as well, just like !28428 (merged) was...