Revert functionality a bit better