All storage water heaters operating above atmospheric pressure shall be provided with an approved, self-closing (levered) pressure relief valve and temperature relief valve or combination thereof. The relief valve shall conform to ANSI Z21.22. The relief valve shall not be used as a means of controlling thermal expansion.