Temporarily restore backwards compatible behavior.