Added code back to adjust_for_cypress_version