the things I wanted from the phar fix

Summary: on https://reviews.facebook.net/D27609 I didn't want to wait and just landed it

Reviewed By: @fredemmott

Differential Revision: D1646082

Signature: t1:1646082:1414612015:080f63c215104dbb830477b75128cdc85fde2474