Updated to Elemental revision af61dd69f632