Another try to make 3rd party plugins backwards compatible