Handle non-watered case.
Revert data model prop name.