Stop using private variants