Moving some changes back in from the work we were doing in the
generated app.