Removes `column_type` and `column_options` so that it works well in both versions. Backcported from master, to release a patch version with this bugfix. [closes #1947]
