Fix API changes to not publicly expose things we shouldn't ;)
Replace modal dialog with custom <select>