Boris Johnson drops plans to make gender change easier