Switch over to using GL 2.1 as a base.