I think we need a new issue about adding the options back if this is going to be our temporary fix.