reverted a couple of things in ext/phar for now, but all tests pass now