Patching things back to improve backwards compatibility.