Revert "Temp disable"