We shouldn't be removing the `data-forms` from the solution