Default options were never returned if omit_pillar flag was set to false (or unset)