Initial push towards compatibility with the upcoming Elemental 0.85 release