Reverted md-addins fixes - turns out those attempts were barking up the wrong tree