Bad Optimization Attempt
Revert "Bad Optimization Attempt"

This reverts commit af4f8107b2172c68ebb616ca5ac6712c44495e00.