Support 1.8 here, also.