Rolling back changes to pre-9.6