Fixes #418 (interoperability issue with other plugins).
Closes #497
See #497.
Unbreaks build on pre-5.4.