Revert "Restored a few more ugly hacks to improve the performance even further."
Revert "Restored a few more ugly hacks to improve the performance even further."

This reverts commit 5520930fa7abaaef346422f320987555c92c48d5.

Conflicts:
	formula/formula_normalize.pl

nicholaspaun/chemlogic,nicholaspaun/chemlogic