Reverted merge of sam_debind into next.