Revert "Try a final optimization..."

This reverts commit 141e879a8a0d49e7c0662f20560405ef8804181a.
Revert "Cache some precomputed quantities..."

This reverts commit c7c1ef3439644983a2b2a7eb7fef10b238224b7e.