Reenable generic build