Port #15309 over to hosted customizer