See the description in this changeset's parent which describes why we do this in two steps. MozReview-Commit-ID: GtO0SCb0UOF