No need to self-validate after all