Auto merge of #25316 - brson:installer, r=alexcrichton

Revert an accidental revert.
This commit is contained in:
bors
2015-05-12 17:27:11 +00:00