Revert style option deprecations.

This reverts commit aed33431b51626c89b9b3ddab1026bf2d83e49ff.
This reverts commit a9a42e971a434a3a4211e40aeb3e57da7f8da61e.
This reverts commit 93d1b74bcb9841b9142af204cd80c5e35d909fe2.
This reverts commit 05715e45df076b30aae122f98492c1f75bfdd223.
This reverts commit 497ef6456793141d0f9293ae370b2bc99ce1992f.
This reverts commit b405795756b46c7d83fa91fcc5e24d3ac6acd729.
This reverts commit 9aec496e94bda2a22f0de099d7335e9da5531fe9.