(#1224) - Revert "don't mutate options object"

This reverts commit f6889de72fae1fa7d63d44cd39e87213fcf36d1d. I
realized it's a regression and actually broke some tests.