Revert commits due to regressions