Support both 1.7.2 and 1.7.5