Am I being dumb - is there no way to do this without doing a customer resolver like this?