Revert "attempt to fix logic, this does cause consensus mismatches"

This reverts commit f18d7c4bb46fe2cc83a875a37e28beb868317d74.