Revert "Revert "autogen: remove broken; should be ok.""

This reverts commit 16e9dac2ed02182aee854eeeb44cd1d0f4a67e61.