This is less heaky of a Gingerbread compile fix.