auto merge of #2231 : Ms2ger/servo/remove-holderType, r=jdm

It is always None.
Work.