Revert "Retire eval margin and gains"