undo php52 fixes