Removing optimization that introduced bug.