2.7 compatibility restored.