This reverts commit f5e1b718. PR43855 reports a performance regression with commit ee50590e. This commit depends on the faulty one, so has to come out too.
