Back out remix_count and nth_remix

Will reintroduce in the tree branch