Revert "Battle of the Dynamic Sets"

This reverts commit eb31fa4e70a2ae610a7364f77f75658e911bee5d.