Very glad to see all this gone. What a silly approach this was.

However, the reason I delayed changing this myself for so long was because there is a high test cost for all of these feedback mechanisms. How are you validating this PR?