Fix #2915 - No need to default view options.

This is a small breaking change, so we'll have to weigh correctness vs. breakage here.  We should certainly mention it in the change log if merged.