Joshua M. Boniface
72f47f216a
This reverts commit 53c0d2b4f620e10f3e0e6b0f19495d8473792563. This resulted in a massive performance hit and some inconsistent behaviour. Revert for now an re-investigate later.