Reverted 1.6 generation changes