revert last commit as conditions are already properly defined by
identifier strategy