Revert bad optimization