Revert "Don't need to do this for all options. #2866."

This reverts commit 07917223fdf2e8175dad822ff8326c054655e426.