removed first pass on php54 backport