This reverts commit 83a798d4. As discussed in D120714 with @thakis, the patch added unneeded complexity without noticeable benefits.