@sarina Yes, I have updated the description of this PR to make note that we removed this Waffle.  I had confirmed this via an email exchange with Marco, Renzo, Victor, and Cale.