Remove optimization tricker. See if it still works...