undo php5.4 compat for separate branch