Revert "be more opinionated"