Revert to force loading the customer but add a comment on why.