CONTRIB-4623: Add return statement to fix upgrade