Back out changes until generate fixed.