Restore non-2.7 compatibility.