Apparently classes themselves are slow
Merge remote-tracking branch 'matt/master'

Conflicts:
	classes/TAssembly.php
Revert "Apparently classes themselves are slow"

This reverts commit fd42833e17e7b1f4e9b9b47594e9af4abf144159.