Revert to prior schema detection (Issue #521)