This matches milestone for removing PHP <5 compatibility