phase out our custom gil handlers