Revert/simplify.