[DEV-1152]

Could we keep this in the same location (lines 4-11)?