Merge "Remove workaround for PHP bug 66021 (PHP < 5.5.12)"