[4.1] Backport An Eloquent Model Fix

See comments on 51ad8ff33931f9b9bf209d95fd3d5c5beaa54857.