Reverted unrelated ZAS modification and unnecessary check.