Revert "[BUGFIX] Prevent sql errors with missing ColumnMap"