cherries: we don't need these training wheels anymore

Change-Id: I4e265746079dac31813b009c04764a49ba94985e