Bug 1066671 - Minor cleanup r=wesj
Bug 1066671 - Regression: Downloading is broken r=wesj