Revert "De-uglified code."

This reverts commit 9d3b20be4c406047c4a696331c6c18987a460a6e.
The less-performant code WILL NOT be included no matter what you do.