This reverts commit e110f1049c. This unfixes issue 6575. Reverted due to huge performance hit on behalf of JMC.
e110f1049c