Revert "Critical fix to labeller which could hang DAWN under very specific circumstances."

This reverts commit 457272acfcfb5a7a8631a52458888ab39dcf0ce8.