Revert "Only set the option locally"

This reverts commit b5905579e4415e2d244bbd12096c888f94e8d82c.