We always set them up earlier in the migrations anyway. (cherry picked from commit dd1a19745a0a9df3814f22dd597585e44d3cba35)