Revert "Add backwards compatibility for not yet released core change"

Authored by thiemowmde on May 16 2018, 10:24 AM.