Reverted support for elemental 0.84