Undo "make more efficient" changes

Need to test next time ;)