Actually use the new option where we need it most...