I want this flag to go away in ChocoButter