UCBG-375: last bits of code to implement this botgarden fix