Remove workaround for yafolding