[Fix] Revert and do another